From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu, 14 Mar 2013 21:00:57 +0000 (-0400)
Subject: background: Rename animationUpdate to updateAnimation
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4464
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b351536dee0b1e0c201678a6fea5d07c9d778903;p=gnome-shell.git

background: Rename animationUpdate to updateAnimation

This is more consistent.

https://bugzilla.gnome.org/show_bug.cgi?id=695882
---

diff --git a/js/ui/background.js b/js/ui/background.js
index bf8757eac..a63d29eb2 100644
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -267,9 +267,9 @@ const Background = new Lang.Class({
     _destroy: function() {
         this._cancellable.cancel();
 
-        if (this._animationUpdateTimeoutId) {
-            GLib.source_remove (this._animationUpdateTimeoutId);
-            this._animationUpdateTimeoutId = 0
+        if (this._updateAnimationTimeoutId) {
+            GLib.source_remove (this._updateAnimationTimeoutId);
+            this._updateAnimationTimeoutId = 0;
         }
 
         let i;
@@ -378,17 +378,17 @@ const Background = new Lang.Class({
         if (this._images[1])
             this._images[1].opacity = this._animation.transitionProgress * 255;
 
-        this._queueAnimationUpdate();
+        this._queueUpdateAnimation();
     },
 
     _updateAnimation: function() {
-        this._animationUpdateTimeoutId = 0;
+        this._updateAnimationTimeoutId = 0;
 
         let files = this._animation.getKeyFrameFiles(this._layoutManager.monitors[this._monitorIndex]);
 
         if (!files) {
             this._setLoaded();
-            this._queueAnimationUpdate();
+            this._queueUpdateAnimation();
             return;
         }
 
@@ -432,8 +432,8 @@ const Background = new Lang.Class({
         }
     },
 
-    _queueAnimationUpdate: function() {
-        if (this._animationUpdateTimeoutId != 0)
+    _queueUpdateAnimation: function() {
+        if (this._updateAnimationTimeoutId != 0)
             return;
 
         if (!this._cancellable || this._cancellable.is_cancelled())
@@ -447,10 +447,10 @@ const Background = new Lang.Class({
 
         let interval = Math.max(ANIMATION_MIN_WAKEUP_INTERVAL * 1000,
                                 timePerStep);
-        this._animationUpdateTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
+        this._updateAnimationTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
                                                       interval,
                                                       Lang.bind(this, function() {
-                                                                    this._animationUpdateTimeoutId = 0;
+                                                                    this._updateAnimationTimeoutId = 0;
                                                                     this._updateAnimation();
                                                                     return false;
                                                                 }));